Skip to content

llvm: Accept new LLVM lifetime format #145120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 15, 2025
Merged

llvm: Accept new LLVM lifetime format #145120

merged 1 commit into from
Aug 15, 2025
+42 −38

Conversation

maurer
Copy link
Contributor

@maurer maurer commented Aug 8, 2025

In llvm/llvm-project#150248 LLVM removed the size parameter from the lifetime format. Tolerate not having that size parameter.

@rustbot
Copy link
Collaborator

rustbot commented Aug 8, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 8, 2025
@rustbot

This comment has been minimized.

Sign in to view
@maurer
Copy link
Contributor Author

maurer commented Aug 8, 2025

Please do not merge this immediately, we're still testing it through the LLVM integration CI.

@rustbot label +LLVM-main

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Aug 8, 2025
@rustbot

This comment has been minimized.

Sign in to view
@rustbot

This comment has been minimized.

Sign in to view
@rustbot

This comment has been minimized.

Sign in to view
@nikic
Copy link
Contributor

nikic commented Aug 8, 2025

You should also adjust the intrinsic emission in

rust/compiler/rustc_codegen_llvm/src/builder.rs

Lines 1679 to 1691 in de3efa7

fn call_lifetime_intrinsic(&mut self, intrinsic: &'static str, ptr: &'ll Value, size: Size) {
let size = size.bytes();
if size == 0 {
return;
}
if !self.cx().sess().emit_lifetime_markers() {
return;
}
self.call_intrinsic(intrinsic, &[self.val_ty(ptr)], &[self.cx.const_u64(size), ptr]);
}
}

aarongable pushed a commit to chromium/chromium that referenced this pull request Aug 11, 2025
@aeubanks
Suppress some rust tests due to LLVM changes
6090ff7 
LLVM changed the way lifetime intrinsics work in llvm/llvm-project#150248.

rust-lang/rust#145120 claims to fix these tests against ToT LLVM, but let's just suppress these until that goes in.

Bug: 437926231
Change-Id: I4737655cdd2e4b3f00844a0b89f83c4ec11cf023
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6838098
Commit-Queue: Arthur Eubanks <[email protected]>
Auto-Submit: Arthur Eubanks <[email protected]>
Reviewed-by: Devon Loehr <[email protected]>
Commit-Queue: Devon Loehr <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1499682}
@rustbot rustbot added the A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. label Aug 11, 2025
@maurer
llvm: Accept new LLVM lifetime format
258915a 
LLVM removed the size parameter from the lifetime format.
Tolerate not having that size parameter.
@maurer
Copy link
Contributor Author

maurer commented Aug 11, 2025

r? nikic

We've got a green run on the HEAD integration: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/39115#01989b27-10da-4bb5-a8e2-d2a4e8dff36c

@rustbot rustbot assigned nikic and unassigned Mark-Simulacrum Aug 11, 2025
@nikic
Copy link
Contributor

nikic commented Aug 12, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 12, 2025

📌 Commit 258915a has been approved by nikic

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 12, 2025
Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 13, 2025
@Zalathar
Rollup merge of rust-lang#145120 - maurer:llvm-time, r=nikic
e3bd237 
llvm: Accept new LLVM lifetime format

In llvm/llvm-project#150248 LLVM removed the size parameter from the lifetime format. Tolerate not having that size parameter.
@Zalathar Zalathar mentioned this pull request Aug 13, 2025
Closed
jdonszelmann added a commit to jdonszelmann/rust that referenced this pull request Aug 13, 2025
@jdonszelmann
Rollup merge of rust-lang#145120 - maurer:llvm-time, r=nikic
e625cdf 
llvm: Accept new LLVM lifetime format

In llvm/llvm-project#150248 LLVM removed the size parameter from the lifetime format. Tolerate not having that size parameter.
@jdonszelmann jdonszelmann mentioned this pull request Aug 13, 2025
Closed
bors added a commit that referenced this pull request Aug 13, 2025
@bors
Auto merge of #145351 - jdonszelmann:rollup-gzg4kca, r=jdonszelmann
3177c00 
Rollup of 9 pull requests

Successful merges:

 - #122661 (Change the desugaring of `assert!` for better error output)
 - #138736 (Sanitizers target modificators)
 - #144955 (search graph: lazily update parent goals)
 - #145120 (llvm: Accept new LLVM lifetime format)
 - #145153 (Handle macros with multiple kinds, and improve errors)
 - #145189 (Weekly `cargo update`)
 - #145250 (Add regression test for former ICE involving malformed meta items containing interpolated tokens)
 - #145309 (Fix `-Zregparm` for LLVM builtins)
 - #145331 (Make std use the edition 2024 prelude)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 14, 2025
@Zalathar
Rollup merge of rust-lang#145120 - maurer:llvm-time, r=nikic
18e906d 
llvm: Accept new LLVM lifetime format

In llvm/llvm-project#150248 LLVM removed the size parameter from the lifetime format. Tolerate not having that size parameter.
@Zalathar Zalathar mentioned this pull request Aug 14, 2025
Closed
bors added a commit that referenced this pull request Aug 14, 2025
@bors
Auto merge of #145373 - Zalathar:rollup-079tzmp, r=Zalathar
3478ce9 
Rollup of 13 pull requests

Successful merges:

 - #122661 (Change the desugaring of `assert!` for better error output)
 - #142372 (Improve `--remap-path-prefix` documentation)
 - #143075 (compiler: Allow `extern "interrupt" fn() -> !`)
 - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit)
 - #145065 (resolve: Introduce `RibKind::Block`)
 - #145120 (llvm: Accept new LLVM lifetime format)
 - #145189 (Weekly `cargo update`)
 - #145261 (Improve tracing in bootstrap)
 - #145266 (Reduce some queries around associated items)
 - #145299 (doc test: fix mpsc.rs try_send doc test)
 - #145331 (Make std use the edition 2024 prelude)
 - #145353 (bootstrap: Fix jemalloc 64K page support for aarch64 tools)
 - #145361 (Suppress wrapper suggestion when expected and actual ty are the same adt and the variant is unresolved)

Failed merges:

 - #145324 (Rename and document `ONLY_HOSTS` in bootstrap)
 - #145372 (resolve: Miscellaneous cleanups)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Aug 14, 2025
@bors
Auto merge of #145373 - Zalathar:rollup-079tzmp, r=Zalathar
f87377a 
Rollup of 13 pull requests

Successful merges:

 - #122661 (Change the desugaring of `assert!` for better error output)
 - #142372 (Improve `--remap-path-prefix` documentation)
 - #143075 (compiler: Allow `extern "interrupt" fn() -> !`)
 - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit)
 - #145065 (resolve: Introduce `RibKind::Block`)
 - #145120 (llvm: Accept new LLVM lifetime format)
 - #145189 (Weekly `cargo update`)
 - #145261 (Improve tracing in bootstrap)
 - #145266 (Reduce some queries around associated items)
 - #145299 (doc test: fix mpsc.rs try_send doc test)
 - #145331 (Make std use the edition 2024 prelude)
 - #145353 (bootstrap: Fix jemalloc 64K page support for aarch64 tools)
 - #145361 (Suppress wrapper suggestion when expected and actual ty are the same adt and the variant is unresolved)

Failed merges:

 - #145324 (Rename and document `ONLY_HOSTS` in bootstrap)
 - #145372 (resolve: Miscellaneous cleanups)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 15, 2025
@Zalathar
Rollup merge of rust-lang#145120 - maurer:llvm-time, r=nikic
71944cb 
llvm: Accept new LLVM lifetime format

In llvm/llvm-project#150248 LLVM removed the size parameter from the lifetime format. Tolerate not having that size parameter.
@Zalathar Zalathar mentioned this pull request Aug 15, 2025
Closed
bors added a commit that referenced this pull request Aug 15, 2025
@bors
Auto merge of #145418 - Zalathar:rollup-qgoixs3, r=Zalathar
f4b87c1 
Rollup of 22 pull requests

Successful merges:

 - #118087 (Add Ref/RefMut try_map method)
 - #122661 (Change the desugaring of `assert!` for better error output)
 - #140740 (Add `-Zindirect-branch-cs-prefix`)
 - #142640 (Implement autodiff using intrinsics)
 - #143075 (compiler: Allow `extern "interrupt" fn() -> !`)
 - #144865 (Fix tail calls to `#[track_caller]` functions)
 - #144944 (E0793: Clarify that it applies to unions as well)
 - #144947 (Fix description of unsigned `checked_exact_div`)
 - #145004 (Couple of minor cleanups)
 - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit)
 - #145012 (Tail call diagnostics to include lifetime info)
 - #145065 (resolve: Introduce `RibKind::Block`)
 - #145120 (llvm: Accept new LLVM lifetime format)
 - #145189 (Weekly `cargo update`)
 - #145235 (Minor `[const]` tweaks)
 - #145275 (fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute)
 - #145322 (Resolve the prelude import in `build_reduced_graph`)
 - #145331 (Make std use the edition 2024 prelude)
 - #145369 (Do not ICE on private type in field of unresolved struct)
 - #145378 (Add `FnContext` in parser for diagnostic)
 - #145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results")
 - #145392 (coverage: Remove intermediate data structures from mapping creation)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request Aug 15, 2025
@Zalathar
Rollup merge of rust-lang#145120 - maurer:llvm-time, r=nikic
de0f7b8 
llvm: Accept new LLVM lifetime format

In llvm/llvm-project#150248 LLVM removed the size parameter from the lifetime format. Tolerate not having that size parameter.
@Zalathar Zalathar mentioned this pull request Aug 15, 2025
Merged
bors added a commit that referenced this pull request Aug 15, 2025
@bors
Auto merge of #145423 - Zalathar:rollup-9jtefpl, r=Zalathar
ba412a6 
Rollup of 21 pull requests

Successful merges:

 - #118087 (Add Ref/RefMut try_map method)
 - #122661 (Change the desugaring of `assert!` for better error output)
 - #142640 (Implement autodiff using intrinsics)
 - #143075 (compiler: Allow `extern "interrupt" fn() -> !`)
 - #144865 (Fix tail calls to `#[track_caller]` functions)
 - #144944 (E0793: Clarify that it applies to unions as well)
 - #144947 (Fix description of unsigned `checked_exact_div`)
 - #145004 (Couple of minor cleanups)
 - #145005 (strip prefix of temporary file names when it exceeds filesystem name length limit)
 - #145012 (Tail call diagnostics to include lifetime info)
 - #145065 (resolve: Introduce `RibKind::Block`)
 - #145120 (llvm: Accept new LLVM lifetime format)
 - #145189 (Weekly `cargo update`)
 - #145235 (Minor `[const]` tweaks)
 - #145275 (fix(compiler/rustc_codegen_llvm): apply `target-cpu` attribute)
 - #145322 (Resolve the prelude import in `build_reduced_graph`)
 - #145331 (Make std use the edition 2024 prelude)
 - #145369 (Do not ICE on private type in field of unresolved struct)
 - #145378 (Add `FnContext` in parser for diagnostic)
 - #145389 ([rustdoc] Revert "rustdoc search: prefer stable items in search results")
 - #145392 (coverage: Remove intermediate data structures from mapping creation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0166de2 into rust-lang:master Aug 15, 2025
10 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Aug 15, 2025
rust-timer added a commit that referenced this pull request Aug 15, 2025
@rust-timer
Unrolled build for #145120
e7a81d0 
Rollup merge of #145120 - maurer:llvm-time, r=nikic

llvm: Accept new LLVM lifetime format

In llvm/llvm-project#150248 LLVM removed the size parameter from the lifetime format. Tolerate not having that size parameter.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikic nikic

Labels
A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.91.0
Development

Successfully merging this pull request may close these issues.
5 participants
@maurer @rustbot @nikic @bors @Mark-Simulacrum